From 3487e40ba447dcff5d303cb68350b7879692185b Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Thu, 9 Feb 2012 12:07:39 +0100 Subject: [PATCH] x86: add Ivy Bridge model numbers to model specific MSR handling This is model 0x3a (decimal 58) as per the most recent SDM. In vPMU code, also add a forgotten earlier model. Signed-off-by: Jan Beulich Acked-by: Xiantao Zhang --- xen/arch/x86/acpi/cpu_idle.c | 2 ++ xen/arch/x86/hvm/vmx/vmx.c | 2 ++ xen/arch/x86/hvm/vmx/vpmu_core2.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index 6af5285105..0102b6329e 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -106,6 +106,8 @@ static void do_get_hw_residencies(void *arg) switch ( c->x86_model ) { + /* Ivy bridge */ + case 0x3A: /* Sandy bridge */ case 0x2A: case 0x2D: diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 935b25b681..0f65334bbd 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1751,6 +1751,8 @@ static const struct lbr_info *last_branch_msr_get(void) case 37: case 44: case 47: /* Sandy Bridge */ case 42: case 45: + /* Ivy Bridge */ + case 58: return nh_lbr; break; /* Atom */ diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index 35ef78a5fd..7412dc8bcd 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -623,8 +623,10 @@ int vmx_vpmu_initialise(struct vcpu *v) case 26: case 29: case 42: + case 45: case 46: case 47: + case 58: vpmu->arch_vpmu_ops = &core2_vpmu_ops; return 0; } -- 2.30.2